bug修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -7562,19 +7562,19 @@ public class StatisticsEsService {
        List<Map<String, Object>> list = null;
        if ("1".equals(qvo.getType())) {
            //查询所有科室
            String sql = "SELECT dept_code 'deptCode',dept_name 'deptName' FROM base_doctor_hospital WHERE del='1'";
            String sql = "SELECT distinct dept_code 'deptCode',dept_name 'deptName' FROM base_doctor_hospital WHERE del='1'";
            if (StringUtils.isNotBlank(qvo.getDeptName())) {
                sql += " and like  '%" + qvo.getDeptName() + "%'";
                sql += " and dept_name like  '%" + qvo.getDeptName() + "%'";
            }
            list = jdbcTemplate.queryForList(sql);
        }
        //根据科室或者名称查医生
        if ("2".equals(qvo.getType())) {
            String sql = "SELECT b.id 'doctorId',b.`name` 'doctorName' FROM base_doctor_hospital a \n" +
            String sql = "SELECT distinct b.id 'doctorId',b.`name` 'doctorName' FROM base_doctor_hospital a \n" +
                    "INNER JOIN base_doctor  b ON a.doctor_code=b.id \n" +
                    "WHERE  1=1 ";
            if (StringUtils.isNotBlank(qvo.getDeptCode())) {
                sql += " and b.dept_code = '" + qvo.getDeptCode() + "' ";
                sql += " and a.dept_code = '" + qvo.getDeptCode() + "' ";
            }
            if (StringUtils.isNotBlank(qvo.getDoctorName())) {
                sql += " and b.`name` LIKE '%" + qvo.getDoctorName() + "%'";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -1595,6 +1595,8 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    /**
     * 查询所有科室和医生
     * strJson={"type":"1","deptName":"心脏"}
     * strJson={"type":"2","deptCode":"0000001","doctorName":"陈淑萍"}
     */
    @GetMapping(value = "/getDeptAndDoctor")
    @ApiOperation(value = "查询所有科室")
@@ -1613,7 +1615,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    /**
     * 查询服务评价详情
     * {"startDate":"2020-07-18","endDate":"2023-11-29","deptCode":"1110000","deptName":"梁敬兴","pageSwitch":"1","page":1,"pageSize":10}
     * strJson={"startDate":"2020-07-18","endDate":"2023-11-29","deptCode":"1110000","deptName":"梁敬兴","pageSwitch":"1","page":1,"pageSize":10}
     */
    @GetMapping(value = "/getDoctorSeverScopeDetail")
    @ApiOperation(value = "查询服务评价详情")