康复随访bug修复

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/controller/DoctorRehabilitaionInfoController.java

@@ -64,7 +64,7 @@ public class DoctorRehabilitaionInfoController extends EnvelopRestEndpoint {
            @ApiParam(name = "downPatientId", value = "下转表id", required = false) @RequestParam(value = "downPatientId", required = false) String downPatientId,
            @ApiParam(name = "doctorId", value = "医生id", required = false) @RequestParam(value = "doctorId", required = false) String doctorId,
            @ApiParam(name = "idcard", value = "检索-身份证或者姓名", required = false) @RequestParam(value = "idcard", required = false) String idcard,
            @ApiParam(name = "status", value = "", defaultValue = "0", required = false) @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "status", value = "",  required = false) @RequestParam(value = "status", required = false) String status,
            @ApiParam(name = "page", value = "起始页", required = false) @RequestParam(value = "page", required = false, defaultValue = "1") Integer page,
            @ApiParam(name = "pagesize", value = "每页显示数据条数", required = false) @RequestParam(value = "pagesize", required = false, defaultValue = "10") Integer pagesize
    ) {

svr/svr-visit-behind/src/main/java/com/yihu/jw/hospital/module/rehabilitation/service/RehabilitationInfoService.java

@@ -968,7 +968,7 @@ public class RehabilitationInfoService {
        }
        if (StringUtils.isBlank(status)) {
            //看全部数据
            filterSql += "	AND (d.create_user = '" + doctorId + "'  OR ISNULL(  d.create_user  ) ) " +
            filterSql += "	AND (d.create_user = '" + doctorId + "'  OR q.plan_doctor='" + doctorId + "' OR ISNULL(  d.create_user  ) ) " +
                    "	    AND ( ISNULL( d.type ) OR d.type = 2 ) ORDER BY d.create_time DESC ";
            detailSql += filterSql + limitSql;
            countSql += filterSql;
@@ -979,7 +979,7 @@ public class RehabilitationInfoService {
        if (StringUtils.isNotBlank(status)) {
            if ("0".equals(status)) {
                //未下转的人
                filterSql += "	AND (d.create_user = '" + doctorId + "'  OR ISNULL(d.create_user)) AND ( ISNULL( d.type ) OR d.type = 2 ) " +
                filterSql += "	AND (d.create_user = '" + doctorId + "' OR q.plan_doctor='" + doctorId + "'  OR ISNULL(d.create_user)) AND ( ISNULL( d.type ) OR d.type = 2 ) " +
                        " and d.status='0' ";
                filterSql += " ORDER BY d.create_time DESC ";
                detailSql += filterSql + limitSql;
@@ -990,7 +990,7 @@ public class RehabilitationInfoService {
            }
            if ("1".equals(status)) {
                //待分配的人
                filterSql += "	AND (d.create_user = '" + doctorId + "' OR ISNULL( d.create_user) )AND ( ISNULL( d.type ) OR d.type = 2 ) " +
                filterSql += "	AND (d.create_user = '" + doctorId + "' OR q.plan_doctor='" + doctorId + "' OR ISNULL( d.create_user) )AND ( ISNULL( d.type ) OR d.type = 2 ) " +
                        "   and d.status='1' ";
                filterSql += " ORDER BY d.create_time DESC ";
                detailSql += filterSql + limitSql;
@@ -1002,7 +1002,7 @@ public class RehabilitationInfoService {
            if ("7".equals(status)) {
                //已经分配医生
                filterSql += "	AND ( d.create_user = '" + doctorId + "'  OR ISNULL(  d.create_user  ) )   " +
                filterSql += "	AND ( d.create_user = '" + doctorId + "' OR q.plan_doctor='" + doctorId + "'  OR ISNULL(  d.create_user  ) )   " +
                        "	AND ( ISNULL( d.type ) OR d.type = 2 ) and d.status='7' ";
                filterSql += " ORDER BY d.create_time DESC ";
                detailSql += filterSql + limitSql;
@@ -1296,7 +1296,7 @@ public class RehabilitationInfoService {
                "	LEFT JOIN wlyy_rehabilitation_plan_detail pd ON pd.plan_id = q.id " +
                "WHERE " +
                "	1 = 1  " +
                " 	AND ( d.create_user = '" + doctorId + "'  OR q.plan_doctor='" + doctorId + "' OR ISNULL( d.create_user ) or pd.doctor='" + doctorId + "' )  " +
                " 	AND ( d.create_user = '" + doctorId + "'  OR q.plan_doctor='" + doctorId + "' OR ISNULL( d.create_user )  )  " +
                "	AND ( ISNULL( d.type ) OR d.type = 2 ) " +
                "	GROUP BY d.`status`";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql);