代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/UserMsgContentService.java

@@ -119,17 +119,17 @@ public class UserMsgContentService extends BaseJpaService<BaseUserMsgContentDO,
        List<Map<String,Object>> resultList= new ArrayList<>();
        Map<String,Object> resultMap = new HashMap<>();
        if(countTmp==0){
            resultMap.put("zjzx","100%");
            resultMap.put("zjzx","100.00%");
        }else {
            resultMap.put("zjzx",df.format(expertMY * 100)+"%");
        }
        if(countOnlineTotalTmp==0){
            resultMap.put("zxfz","100%");
            resultMap.put("zxfz","100.00%");
        }else {
            resultMap.put("zxfz",df.format(inlineMY * 100)+"%");
        }
        if(totalCountTmp==0){
            resultMap.put("totalCount","100%");
            resultMap.put("totalCount","100.00%");
        }else {
            resultMap.put("totalCount",df.format(totalConunt * 100)+"%");
        }

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/iot/device/DeviceHealthIndexVO.java

@@ -30,6 +30,8 @@ public class DeviceHealthIndexVO {
    private String value7;
    private String healthStandard;
    private String button;
    private String dept;
    private String deptName;
    public DeviceHealthIndexVO() {
    }
@@ -204,4 +206,20 @@ public class DeviceHealthIndexVO {
    public void setButton(String button) {
        this.button = button;
    }
    public String getDept() {
        return dept;
    }
    public void setDept(String dept) {
        this.dept = dept;
    }
    public String getDeptName() {
        return deptName;
    }
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }
}

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/StatisticsController.java

@@ -65,11 +65,11 @@ public class StatisticsController extends EnvelopRestEndpoint {
    @GetMapping(value = "deviceUseDetail")
    @ApiOperation(value = "设备使用情况明细")
    public ListEnvelop deviceUseDetail(@RequestParam(required = false) String sort,
    public ListEnvelop deviceUseDetail(@RequestParam(required = false) String sorting,
                                       @RequestParam(required = false) String startDate,
                                       @RequestParam(required = false) String endDate) {
        try {
            List<Map<String,Object>> list = statisticsService.deviceUseDetail(sort,startDate,endDate);
            List<Map<String,Object>> list = statisticsService.deviceUseDetail(sorting,startDate,endDate);
            return ListEnvelop.getSuccess("查询成功",list);
        } catch (Exception e) {
            e.printStackTrace();
@@ -81,12 +81,12 @@ public class StatisticsController extends EnvelopRestEndpoint {
    //导出设备使用情况明细
    @GetMapping(value="exportExcel/deviceUseDetail")
    public void exportList(
            @RequestParam(required = false) String sort,
            @RequestParam(required = false) String sorting,
            @RequestParam(required = false) String startDate,
            @RequestParam(required = false) String endDate,
            HttpServletResponse response){
        try {
            List<Map<String,Object>> list = statisticsService.deviceUseDetail(sort,startDate,endDate);
            List<Map<String,Object>> list = statisticsService.deviceUseDetail(sorting,startDate,endDate);
            response.setContentType("octets/stream");
            response.setHeader("Content-Disposition", "attachment; filename=deviceUseDetail.xls");
            OutputStream os = response.getOutputStream();

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/common/service/StatisticsService.java

@@ -62,7 +62,7 @@ public class StatisticsService {
            if("1".equals(type)){
                devcieXt = Integer.parseInt(map.get("num")+"");
            }
            if("3".equals(type)){
            if("2".equals(type)){
                devcieXy = Integer.parseInt(map.get("num")+"");
            }
        }
@@ -81,7 +81,7 @@ public class StatisticsService {
            if("1".equals(type)){
                uploadXt = Integer.parseInt(map.get("num")+"");
            }
            if("3".equals(type)){
            if("2".equals(type)){
                uploadXy = Integer.parseInt(map.get("num")+"");
            }
        }