文件结构调整

src/main/java/com/yihu/ehr/basic/dict/controller/ConventionalDictEndPoint.java

@@ -47,11 +47,9 @@ public class ConventionalDictEndPoint extends EnvelopRestEndPoint {
            @RequestParam(value = "page", required = false) int page) throws ParseException {
        ListResult listResult = new ListResult();
        List<SystemDictEntry> conventionalDictList = dictEntryService.search(null, filters, sorts, page, size);
        List<MConventionalDict> conventionalDictLists = (List)convertToModels(conventionalDictList, new ArrayList<>(), MConventionalDict.class, null);
        List<MConventionalDict> conventionalDictList = dictEntryService.search(null, filters, sorts, page, size);
        if(conventionalDictList != null){
            listResult.setDetailModelList(conventionalDictLists);
            listResult.setDetailModelList(conventionalDictList);
            listResult.setTotalCount((int)dictEntryService.getCount(filters));
            listResult.setCode(200);
            listResult.setCurrPage(page);

src/main/java/com/yihu/ehr/basic/org/controller/OrgEndPoint.java

@@ -63,9 +63,9 @@ public class OrgEndPoint extends EnvelopRestEndPoint {
    @RequestMapping(value = "/organizations/getAllOrgs", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "查询所有机构列表")
    public List<MOrganization> getAllOrgs() throws Exception {
    public Collection<MOrganization> getAllOrgs() throws Exception {
        List<Organization> orgs = orgService.search(null);
        return (List)convertToModels(orgs, new ArrayList<MOrganization>(orgs.size()), MOrganization.class, "");
        return convertToModels(orgs, new ArrayList<MOrganization>(orgs.size()), MOrganization.class, "");
    }
@@ -455,9 +455,9 @@ public class OrgEndPoint extends EnvelopRestEndPoint {
    @RequestMapping(value = "/organizations/getAllOrgsNoPaging", method = RequestMethod.GET, consumes = MediaType.APPLICATION_JSON_UTF8_VALUE)
    @ApiOperation(value = "查询所有机构列表不分页")
    public List<MOrganization> getAllOrgsNoPaging() throws Exception {
    public Collection<MOrganization> getAllOrgsNoPaging() throws Exception {
        List<Organization> orgs = orgService.search(null);
        return  (List)convertToModels(orgs, new ArrayList<MOrganization>(orgs.size()), MOrganization.class, "");
        return  convertToModels(orgs, new ArrayList<MOrganization>(orgs.size()), MOrganization.class, "");
    }
    @RequestMapping(value = "/organizations/batch", method = RequestMethod.POST)

src/main/java/com/yihu/ehr/basic/user/controller/RoleReportRelationEndPoint.java

@@ -72,7 +72,7 @@ public class RoleReportRelationEndPoint extends EnvelopRestEndPoint {
            @RequestParam(value = "page", required = false) int page,
            HttpServletRequest request,
            HttpServletResponse response) throws Exception {
        List<RoleReportRelation> roleFeatureRelations = roleReportRelationService.search(fields, filters, sorts, page, size);
        List<MRoleReportRelation> roleFeatureRelations = (List<MRoleReportRelation>)roleReportRelationService.search(fields, filters, sorts, page, size);
        pagedResponse(request, response, roleReportRelationService.getCount(filters), page, size);
        return convertToModels(roleFeatureRelations, new ArrayList<MRoleReportRelation>(roleFeatureRelations.size()), MRoleReportRelation.class, fields);
    }