代码修改

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

@@ -446,9 +446,9 @@ 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;
        }
//        if ("admin".equalsIgnoreCase(role)) {去掉管理员
//            queryAll = true;
//        }
        String sql = "select DISTINCT t.id as \"id\"," +
                " t.complaint_id as \"complaintId\"," +
                " t.complaint_name as \"complaintName\"," +
@@ -529,13 +529,14 @@ public class BaseComplaintService {
                if (StringUtils.isNoneBlank(status) && "3".equalsIgnoreCase(status)) {
                    sql += " and g.operate_from='" + doctor;
                } else if (StringUtils.isNoneBlank(status) && "0".equalsIgnoreCase(status)) {
                    sql += " and t.status='0' and t.passto='" + doctor + "'"+ "' and t.complaint_id='"+complaint+"' ";
                    sql += " and t.status='0' and t.passto='" + doctor + "' and t.complaint_id='"+complaint+"' ";
                } else if (StringUtils.isNoneBlank(status) && "1".equalsIgnoreCase(status)) {
                    sql += "  and t.status='1' and t.acceptor='" + doctor + "' ";
                } else if (StringUtils.isNoneBlank(status) && "2".equalsIgnoreCase(status)) {
                    sql += " and t.status='2' and t.operator='" + doctor + "' ";
                } else {
                    sql += " and t.id IN (select col.relation_code from base_complaint_operate_log col where col.operate_to = '" + doctor + "'  )";
                    sql += " and ((t.status='2' and t.operator='" + doctor + "') or (t.status='1' and t.acceptor='" + doctor + "') " +
                            " or (t.status='0' and t.passto='" + doctor + "' and t.complaint_id='"+complaint+"')) ";
                }
            }
@@ -749,27 +750,29 @@ public class BaseComplaintService {
                recieve = getCountByStatus(doctor, "1",complaint, isOther);
                deal = getCountByStatus(doctor, "2",complaint, isOther);
//                passto = getCountByPassto(doctor);
                total = getCountByStatus(doctor, "",complaint, isOther);
//                total = getCountByStatus(doctor, "",complaint, isOther);
                //撤销
                cacel = getCountByStatus(doctor, "-1",complaint, isOther);
                if (StringUtils.isNotBlank(pcAdmin)) {
                    total = complaints + recieve+deal+cacel;
                    System.out.println("是pc管理员");
                } else {
                    total = total - cacel;
                    total = complaints + recieve+deal;
                }
            } else {
                complaints = getCountByStatus(doctor, "0",complaint, isOther);
                recieve = getCountByStatus(doctor, "1",complaint, isOther);
                deal = getCountByStatus(doctor, "2",complaint, isOther);
//                passto = getCountByPassto(doctor);
                total = getCountByStatus(doctor, "",complaint, isOther);
//                total = getCountByStatus(doctor, "",complaint, isOther);
                //撤销
                cacel = getCountByStatus(doctor, "-1",complaint, isOther);
                if (StringUtils.isNotBlank(pcAdmin)) {
                    total = complaints + recieve+deal+cacel;
                    System.out.println("是pc管理员");
                } else {
                    total = total - cacel;
                    total = complaints + recieve+deal;
                }
            }
@@ -828,7 +831,7 @@ public class BaseComplaintService {
            if (StringUtils.isNoneBlank(status) && "3".equalsIgnoreCase(status)) {
                sql += " and g.operate_from='" + doctor + "'";
            } else if (StringUtils.isNoneBlank(status) && "0".equalsIgnoreCase(status)) {
                sql += " and t.status='0' and t.passto='" + doctor + "'"+ "' and t.complaint_id='"+complaint+"' ";
                sql += " and t.status='0' and t.passto='" + doctor + "'  and t.complaint_id='"+complaint+"' ";
            } else if (StringUtils.isNoneBlank(status) && "1".equalsIgnoreCase(status)) {
                sql += "  and t.status='1' and t.acceptor='" + doctor + "' ";
            } else if (StringUtils.isNoneBlank(status) && "2".equalsIgnoreCase(status)) {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/health/service/DeviceService.java

@@ -432,9 +432,8 @@ public class DeviceService {
			indexVO.setHealthStandard(gethealthStandard(indexVO.getType(),indexVO.getUser()).toString());
		}
		long count = jdbcTemplate.queryForObject(countSql+filter.toString(),Long.class);
		String regex = "(\\w{3})(\\w+)(\\w{3})";
		return PageEnvelop.getSuccessListWithPage("",resultList,page,pageSize,count);
		long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
		return PageEnvelop.getSuccessListWithPage("查询成功",resultList,page,pageSize,count);
	}
	public JSONObject gethealthStandard(Integer type, String patientCode) {
		//血糖校验