慢阻肺综合查询相关修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceConfigurationController.java

@@ -42,7 +42,7 @@ public class ResourceConfigurationController extends EnvelopRestEndpoint {
        params.put("filters", "");
        String filters ="valid=1";
        if (!StringUtils.isEmpty(searchNm)){
            filters += ";name?" + searchNm + " g1;id?" + searchNm + " g1";
            filters += ";name?" + searchNm + " g1;ehrId?" + searchNm + " g1";
        }
        params.put("filters",filters);
        params.put("page", page);

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/RsResourceCategoryController.java

@@ -8,6 +8,7 @@ import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.entity.ServiceException;
import io.swagger.annotations.Api;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -165,6 +166,8 @@ public class RsResourceCategoryController extends EnvelopRestEndpoint {
            String url = "/resources/category/" + id;
            rsCategoryService.deleteRsCategory(id);
            return success("删除成功");
        }catch (ServiceException se){
            return failed(se.getMessage());
        }catch (Exception ex){
            ex.printStackTrace();
            return failed(ERR_SYSTEM_DES);

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceBrowseService.java

@@ -70,42 +70,20 @@ public class ResourceBrowseService extends BaseJpaService {
            return null;
        }
        Map<String, String> correspondMap = new HashMap<>();
        boolean isOtherVersion = false;
        String version = "";
        String code = "";
        if (resourcesCode.split("\\$").length > 1) {
            isOtherVersion = true;
            version = resourcesCode.split("\\$")[1];
            code = resourcesCode.split("\\$")[0];
        }
        List<DtoResourceMetadata> metadataList = resourceBrowseDao.getAccessMetadata(rsResource, roleId, correspondMap);
        //资源结构
        List<MRsColumnsModel> mRsColumnsModels = new ArrayList<>();
        if (metadataList != null) {
            for (DtoResourceMetadata r : metadataList) {
                MRsColumnsModel mRsColumnsModel = new MRsColumnsModel();
                if (!isOtherVersion) {
                    mRsColumnsModel.setValue(r.getName());
                    if (!StringUtils.isEmpty(r.getDictCode())) {
                        mRsColumnsModel.setCode(r.getEhrId());
                    } else {
                        mRsColumnsModel.setCode(r.getEhrId());
                    }
                    mRsColumnsModel.setType(r.getColumnType());
                    mRsColumnsModel.setDict(r.getDictCode());
                mRsColumnsModel.setValue(r.getName());
                if (!StringUtils.isEmpty(r.getDictCode())) {
                    mRsColumnsModel.setCode(r.getStdCode());
                } else {
//                    String name = stdTransformClient.stdMetadataName(version, code, correspondMap.get(r.getId()));
//                    if (!StringUtils.isEmpty(name)) {
//                        mRsColumnsModel.setValue(name);
//                        if (!StringUtils.isEmpty(r.getDictCode())) {
//                            mRsColumnsModel.setCode(r.getId() + "_VALUE");
//                        } else {
//                            mRsColumnsModel.setCode(r.getId());
//                        }
//                        mRsColumnsModel.setType(r.getColumnType());
//                        mRsColumnsModel.setDict(r.getDictCode());
//                    }
                    mRsColumnsModel.setCode(r.getStdCode());
                }
                mRsColumnsModel.setType(r.getColumnType());
                mRsColumnsModel.setDict(r.getDictCode());
                mRsColumnsModels.add(mRsColumnsModel);
            }
        }

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/RsResourceCategoryService.java

@@ -5,6 +5,7 @@ import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.basic.resource.dao.RsResourceCategoryDao;
import com.yihu.jw.basic.resource.dao.RsResourceDao;
import com.yihu.jw.entity.ehr.resource.RsResourceCategory;
import com.yihu.jw.util.entity.ServiceException;
import org.hibernate.query.Query;
import org.hibernate.Session;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,12 +36,12 @@ public class RsResourceCategoryService extends BaseJpaService<RsResourceCategory
     *
     * @param id 资源类别id
     */
    public void deleteRsCategory(String id) throws Exception {
    public void deleteRsCategory(String id) throws ServiceException {
        if(rsResourcesCategoryDao.countByPid(id) > 0) {
            throw new Exception("此类别包含子类别!");
            throw new ServiceException("此类别包含子类别!");
        }
        if(resourcesDao.countByCategoryId(id) > 0) {
            throw new Exception("此类别包含资源!");
            throw new ServiceException("此类别包含资源!");
        }
        rsResourcesCategoryDao.deleteById(id);
    }