Merge branch 'master' of http://192.168.1.220:10080/EHR/svr-basic

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

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

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

@@ -17,6 +17,7 @@ import com.yihu.ehr.model.org.MOrganization;
import com.yihu.ehr.basic.org.model.OrgDept;
import com.yihu.ehr.basic.org.service.OrgDeptService;
import com.yihu.ehr.basic.org.service.OrgService;
import com.yihu.ehr.model.user.MRoleReportRelation;
import com.yihu.ehr.util.phonics.PinyinUtil;
import com.yihu.ehr.util.rest.Envelop;
import io.swagger.annotations.Api;
@@ -63,8 +64,8 @@ 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 {
        List<MOrganization> orgs = orgService.search(null);
        return orgs;
        List<Organization> orgs = orgService.search(null);
        return (List)convertToModels(orgs, new ArrayList<MOrganization>(orgs.size()), MOrganization.class, "");
    }
@@ -455,8 +456,8 @@ 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 {
        List<MOrganization> orgs = orgService.search(null);
        return orgs;
        List<Organization> orgs = orgService.search(null);
        return  (List)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<MRoleReportRelation> roleFeatureRelations = (List<MRoleReportRelation>)roleReportRelationService.search(fields, filters, sorts, page, size);
        List<RoleReportRelation> roleFeatureRelations = 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);
    }
@@ -82,8 +82,9 @@ public class RoleReportRelationEndPoint extends EnvelopRestEndPoint {
    public List<MRoleReportRelation> searchRoleReportRelationNoPage(
            @ApiParam(name = "filters", value = "过滤器，为空检索所有信息", defaultValue = "")
            @RequestParam(value = "filters", required = false) String filters) throws Exception {
        List<MRoleReportRelation> list = roleReportRelationService.search(filters);
        return list;
        List<RoleReportRelation> list = roleReportRelationService.search(filters);
        return (List)convertToModels(list, new ArrayList<MRoleReportRelation>(list.size()), MRoleReportRelation.class, "");
    }
    @RequestMapping(value = ServiceApi.Roles.SearchRoleReportRelationIsReportAccredited, method = RequestMethod.GET)