Merge branch 'master' of shine/esb into master

Hos-resource/src/main/java/com/yihu/ehr/datacollect/dao/DatacollectDao.java

@@ -75,9 +75,9 @@ public class DatacollectDao extends SQLGeneralDAO implements IDatacollectDao {
    @Override
    public String getSchemeAndVersion(String schemeVersionId) throws Exception
    {
        String sql = "select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v " +
        String sql = "select IFNULL( (select  CONCAT_WS(' -- ',s.name,v.name)  from adapter_scheme_version v " +
                "left join adapter_scheme s on s.id = v.scheme_id " +
                "where v.version='"+schemeVersionId+"'";
                "where v.version='"+schemeVersionId+"'),'')";
        return super.scalarBySql(sql, String.class);
    }

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsCategoryController.java

@@ -50,13 +50,14 @@ public class RsCategoryController extends BaseController {
            String s=rrrd.getRemark();
            StringBuilder s1=new StringBuilder();
            for(int i=0;i<s.length();i++) {
                if (s.charAt(i) == '\'' || s.charAt(i) == '\"') {
                    s1.append("\\");
                    s1.append(s.charAt(i));
            if(s!=null) {
                for (int i = 0; i < s.length(); i++) {
                    if (s.charAt(i) == '\'' || s.charAt(i) == '\"') {
                        s1.append("\\");
                        s1.append(s.charAt(i));
                    } else
                        s1.append(s.charAt(i));
                }
                else
                    s1.append(s.charAt(i));
            }
            rrrd.setRemark(s1.toString());
            model.addAttribute("model", rrrd);

Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsDimensionController.java

@@ -8,11 +8,14 @@ import org.apache.commons.beanutils.BeanUtils;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
import java.util.HashMap;
import java.util.Map;
@@ -57,14 +60,17 @@ public class RsDimensionController {
     * @return
     */
    @RequestMapping("/editorDimension")
    public String editorDimension(Model model, String id) {
        if (!StringUtils.isEmpty(id)) {
            try {
                model.addAttribute("model", rsDimensionService.getDimensionById(id));
            } catch (Exception e) {
    public String editorDimension(Model model, String id,String category) {
        try {
            if (!StringUtils.isEmpty(id))
                    model.addAttribute("model", rsDimensionService.getDimensionById(id));
            if(category!=null)
                 model.addAttribute("category",category);
            }
        catch (Exception e) {
            }
        }
        model.addAttribute("contentPage", "dimension/dimension/editorDimension");
        return "pageView";
    }
@@ -119,6 +125,7 @@ public class RsDimensionController {
        try {
            Map<String, Object> conditionMap = new HashMap<String, Object>();
            conditionMap.put("category", request.getParameter("dimensionCategoryId"));
            conditionMap.put("name", request.getParameter("name"));
            String page = (String) conditionMap.get("page");
            String rows = (String) conditionMap.get("rows");
            conditionMap.put("page", StringUtils.isEmpty(page) ? 1 : Integer.valueOf(page));

Hos-resource/src/main/java/com/yihu/ehr/resource/dao/impl/RsResourceDimensionDaoImpl.java

@@ -29,6 +29,10 @@ public class RsResourceDimensionDaoImpl extends SQLGeneralDAO implements IRsReso
        if (!StringUtils.isEmpty(conditionMap.get("category"))) {
            sb.append(" and r.category= '" + conditionMap.get("category") + "'  ");
        }
        else if(!StringUtils.isEmpty(conditionMap.get("name")))
        {
            sb.append(" and r.name like '%" + conditionMap.get("name") + "%'");
        }
        return super.getDataGridResult(sb.toString(), (Integer)conditionMap.get("page"), (Integer)conditionMap.get("rows"));
    }
}

Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsResourceRestServiceImpl.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.Map;
/**
@@ -45,13 +46,21 @@ public class RsResourceRestServiceImpl implements IRsResourceRestService {
    @Transactional
    public Result deleteResourceRestById(String id) throws Exception {
        Map<String, Object> conditionMap = new HashMap<>();
        conditionMap.put("resourceRestId",id);
        if(resourceRestDetailDao.getResourceRestDetilList(conditionMap, 1, 10).getTotalCount()!=0)
        {
            return Result.error("该资源存在业务项");
        }
        RsResourceRest r = resourceRestDao.getEntity(RsResourceRest.class, id);
        //resourceRestDetailDao.get
        resourceRestDao.deleteEntity(r);
        return Result.success("删除成功");
    }
    @Transactional
    public Result deleteResourceRestDetail(String id) throws Exception {
        RsResourceRestDetail r = resourceRestDetailDao.getEntity(RsResourceRestDetail.class, id);
        resourceRestDetailDao.deleteEntity(r);
        return Result.success("删除成功");

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimension/dimension.jsp

@@ -17,12 +17,6 @@
                    <div class="m-form-control">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入名称"/>
                    </div>
                    <div class="m-form-control">
                        <!--按钮:查询 & 新增-->
                        <div id="btn_search" class="l-button">
                            <span>搜索</span>
                        </div>
                    </div>
                    <div class="m-form-control right" >
                        <div id="div_new_dimension" class="l-button">
                            <span>新增维度</span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimension/dimensionJs.jsp

@@ -30,10 +30,10 @@
        },
        initLeft: function () {
            this.$leftSearch = this.$leftSearch.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            this.$leftSearch = this.$leftSearch.ligerSearch({
                width: 180, onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0) {
                        $.ligerui.get('dimension_tree').queryByText(value);
                    }
                }
            });
@@ -65,10 +65,14 @@
            this.$newDimension.click(function () {
                dimension.editorDialog();
            });
            this.$rightSearch = this.$rightSearch.ligerTextBox({
                width: 200, isSearch: true, onChangeValue: function (value) {
            this.$rightSearch = this.$rightSearch.ligerSearch({
                width: 200,onClick: function (value) {
                    if (value != "" && value != null && value != undefined && value.length > 0) {
                        dimension.$rightGrid.set({
                            parms: {name:$('#txtName').val()}
                        });
                        dimension.$rightGrid.reload();
                        dimension.$rightGrid.changePage(first);
                    }
                }
            });
@@ -131,6 +135,11 @@
            })
        }, dialogSuccess: function (message) {
            $.ligerDialog.success(message);
            if(dimension.$leftTree.getSelected()!=null) {
                dimension.$rightGrid.set({
                    parms: {dimensionCategoryId: dimension.$leftTree.getSelected().data.id}
                });
            }
            this.$rightGrid.reload();
            this.$dialog.close();
        },
@@ -140,8 +149,14 @@
            var params = null;
            if (id != undefined && id != null) {
                title = "编辑维度信息";
                params = {id: id};
            }
            else{
                //alert(dimension.$leftTree.getSelected().data.name);
                if(dimension.$leftTree.getSelected()!=null)
                     params = {category:dimension.$leftTree.getSelected().data.id};
            }
            this.$dialog = $.ligerDialog.open({
                height: 300,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimension/editorDimensionJs.jsp

@@ -20,6 +20,8 @@
            $("#type").ligerComboBox({dict: true, dictName: "RESOURCE_DIMENSION_TYPE"});
            var data;
            var modelString = "${model.id}";
            var category="${category}";
            debugger
            if (modelString != undefined && modelString != null && modelString.length > 0) {
                data={
                    id: "${model.id}",
@@ -31,6 +33,12 @@
                me.actionUrl = "${contextRoot}/dimension/updateDimension";
            }
            else if(category!=undefined&&category!=null&&category.length>0){
                data= {
                    category: category
                }
            }
            this.$form.ligerAutoForm({
                data:data,
                validate:{
@@ -46,7 +54,7 @@
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = !$("#div_info_form").ligerAutoForm("getData");
                var data = $("#div_info_form").ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/dimensioncatetory.jsp

@@ -8,15 +8,8 @@
        <div class="m-form-inline">
            <div class="m-form-group">
                <div class="m-form-control">
                    <div class="l-text">
                        <input type="text" id="txtName" class="l-text-field" placeholder="请输入名称"/>
                    </div>
                </div>
                <div class="m-form-control f-ml20">
                    <!--按钮:查询 & 新增-->
                    <div id="btn_search" class="l-button">
                        <span>搜索</span>
                    </div>
                </div>
                <div class="m-form-control right">
                    <div id="div_new_record" class="l-button">

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/dimensioncatetoryJs.jsp

@@ -37,9 +37,10 @@
        },
        bindEvents: function () {
            var me = this;
            $('#btn_search').click(function () {
            $('#txtName').ligerSearch({onClick:function () {
                me.reloadGrid();
            });
            }}),
            $('#div_new_record').click(function () {
                me.editorDialog();
            });

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetory.jsp

@@ -20,6 +20,7 @@
    </div>
    <div class="m-form-bottom">
        <input name="id" hidden="hidden"/>
        <div id="btnCancel" class="l-button l-button-no">
            <span>关闭</span>
        </div>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/dimension/dimensioncatetory/editorDimensionCatetoryJs.jsp

@@ -40,7 +40,7 @@
                if(!me.$form.ligerAutoForm("validate")){
                    return;
                }
                var data = me.$form.ligerAutoForm("validate");
                var data = me.$form.ligerAutoForm("getData");
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceDimensionDialog.jsp

@@ -17,11 +17,10 @@
            <form id="div_dimension_form">
                <div class="m-form-group">
                    <div class="l-text-wrapper m-form-control " style="margin-left: 40px;margin-right: 13px">
                        <input type="text" id="dimensionId" data-type="select" readonly class="required"
                               data-attr-scan="dimensionId">
                        <input type="text" id="dimensionId" data-type="select" name="dimensionId">
                    </div>
                    <div class="l-text-wrapper m-form-control ">
                        <input type="text" id="dimensionValue" class="required" data-attr-scan="dimensionValue">
                        <input type="text" id="dimensionValue" class="required" name="dimensionValue">
                    </div>
                </div>
            </form>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceDimensionDialogJs.jsp

@@ -50,10 +50,10 @@
                    type: "POST",
                    url: "${contextRoot}/resource/resource/saveResourceDimension",
                    dataType: "json",
                    data: {appResourceDeatilId:appResourceDeatilId,value:appInfoForm.$btnDimensionValue.getValue(),dimensionId:appInfoForm.$btnSelectDimension.getValue()},
                    data: {appResourceDeatilId:rsResourceDimensionDialog.appResourceDeatilId,value:rsResourceDimensionDialog.$btnDimensionValue.getValue(),dimensionId:rsResourceDimensionDialog.$btnSelectDimension.getValue()},
                    success: function (data) {
                        if (data.successFlg) {
                            window.parent.dialogSuccess(data.message,"2");
                            window.parent.reResourceAuthorize.dialogSuccess(data.message,"2");
                        }
                        else {
                            $.ligerDialog.error(data.message);

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceInfoDialog.jsp

@@ -45,6 +45,7 @@
    <div position="bottom" title="">
        <input name="id" hidden="hidden"/>
        <div class="m-form-bottom">
            <div id="btn_cancel" class="l-button l-button-no">
                <span>关闭</span>

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDetailDialogJs.jsp

@@ -54,7 +54,8 @@
                if (!$("#div_info_form").ligerAutoForm("validate")) {
                    return;
                }
                var data = !$("#div_info_form").ligerAutoForm("getData")
                debugger
                var data =$("#div_info_form").ligerAutoForm("getData")
                $.ajax({ //ajax处理
                    type: "POST",
                    url: me.actionUrl,

Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestDialogJs.jsp

@@ -46,6 +46,7 @@
                    return;
                }
                var data =$("#div_info_form").ligerAutoForm("getData");
                data.id='${model.id}';
                $.ajax({ //ajax处理
                    type: "POST",
                    url : me.actionUrl,