代码修改

business/base-service/src/main/java/com/yihu/jw/complaint/BaseComplaintService.java

@@ -455,9 +455,6 @@ public class BaseComplaintService {
                                        String startTime, String endTime, Integer page, Integer pageSize, String pcAdmin) {
        MixEnvelop mixEnvelop = new MixEnvelop();
        Boolean queryAll = false;
//        if ("admin".equalsIgnoreCase(role)) {去掉管理员
//            queryAll = true;
//        }
        String sql = "select DISTINCT t.id as \"id\"," +
                " t.complaint_id as \"complaintId\"," +
                " t.complaint_name as \"complaintName\"," +
@@ -493,11 +490,11 @@ public class BaseComplaintService {
                " left join base_patient b on t.patient=b.id ";
        sql += " left join base_complaint_operate_log g on t.id=g.relation_code where t.is_del='1' ";
        if (StringUtils.isBlank(pcAdmin)) {
        if (!"1".equals(pcAdmin)) {
            //排除撤销的
            sql += " and t.status<>'-1' ";
        } else {
            System.out.println("pc管理员不用排除撤销的");
            queryAll = true;
        }
        if (StringUtils.isNoneBlank(status) && "3".equalsIgnoreCase(status)) {
@@ -727,10 +724,9 @@ public class BaseComplaintService {
        Integer passto = 0;
        Integer total = 0;
        Boolean queryAll = false;
//        if ("admin".equalsIgnoreCase(role)) {
//            queryAll = true;
//        }
        if ("1".equalsIgnoreCase(pcAdmin)) {
            queryAll = true;
        }
        if (!queryAll) {
            String complaint = "";
            String isOther = "";
@@ -782,11 +778,7 @@ public class BaseComplaintService {
            deal = baseComplaintDao.getCountByStatus("2");
            cacel = baseComplaintDao.getCountByStatus("-1");
//            passto = getCountByPassto("");
            total = complaints + recieve + deal;
            if (StringUtils.isNotBlank(pcAdmin)) {
                //是管理员加上撤销的
                total = +cacel;
            }
            total = complaints + recieve + deal+cacel;
        }
        Map map = new HashMap();
        map.put("complaints", complaints);