Merge branch 'medicare' of liubing/wlyy2.0 into medicare

business/base-service/src/main/java/com/yihu/jw/hospital/team/service/WlyyAdminTeamService.java

@@ -43,6 +43,23 @@ public class WlyyAdminTeamService {
    private JdbcTemplate jdbcTemplate;
    //查询机构
    public MixEnvelop findHospitalByTown(String townCode,String name,Integer page,Integer pageSize){
        PageRequest pageRequest = new PageRequest(page-1,pageSize);
        MixEnvelop mixEnvelop = new MixEnvelop();
        List<DmHospitalDO> list =null;
        if (StringUtils.isNoneBlank(name)){
            list=hospitalDao.findByTownCodeAndName(townCode,name,pageRequest);
        }else {
            list = hospitalDao.findByTownCode(townCode,pageRequest);
        }
        mixEnvelop.setCurrPage(page);
        mixEnvelop.setPageSize(pageSize);
        mixEnvelop.setDetailModelList(list);
        mixEnvelop.setTotalCount(list==null?0:list.size());
        return mixEnvelop;
    }
    //查询机构
    public MixEnvelop findOrgDeviceList(String townCode,String name,Integer page,Integer pageSize){
        PageRequest pageRequest = new PageRequest(page-1,pageSize);
        MixEnvelop mixEnvelop = new MixEnvelop();
        List<DmHospitalDO> list =null;
@@ -66,6 +83,7 @@ public class WlyyAdminTeamService {
        mixEnvelop.setTotalCount(count);
        return mixEnvelop;
    }
    //查询团队
    public MixEnvelop findTeamByOrg(String cityCode,String townCode,String orgCode,Integer page,Integer pageSize){
        String sql ="select t.id as \"id\"," +

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/area/BaseEquipmentEndpoint.java

@@ -52,4 +52,24 @@ public class BaseEquipmentEndpoint extends EnvelopRestEndpoint {
        }
    }
    @ApiOperation("查询社区")
    @GetMapping("/findOrgDeviceList")
    public MixEnvelop findOrgDeviceList(@ApiParam(name = "code", value = "区code", required = false)
                                  @RequestParam(value = "code", required = false)String code,
                                  @ApiParam(name = "name", value = "社区名称", required = false)
                                  @RequestParam(value = "name", required = false)String name,
                                  @ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
                                  @RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
                                  @ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
                                  @RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
        try {
            return wlyyAdminTeamService.findOrgDeviceList(code,name,page,pageSize);
        }catch (Exception e){
            System.out.println(e.getClass());
            return failedMixEnvelopException(e);
        }
    }
 }