shine 9 år sedan
förälder
incheckning
3051d88d89

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

@ -75,8 +75,8 @@ 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\n" +
                "left join adapter_scheme s on s.id = v.scheme_id \n" +
        String sql = "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+"'";
        return super.scalarBySql(sql, String.class);
    }

+ 11 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourcerest/resourceRestJs.jsp

@ -98,6 +98,7 @@
                            if(data.successFlg) {
                                $.ligerDialog.success(data.message);
                                resourceRest.$dictGrid.reload();
                                resourceRest.$dictGrid.changePage("first");
                            }
                            else{
                                $.ligerDialog.error(data.message);
@ -144,6 +145,7 @@
                            if(data.successFlg) {
                                $.ligerDialog.success(data.message);
                                resourceRest.$dictItemGrid.reload();
                                resourceRest.$dictItemGrid.changePage("first");
                            }
                            else{
                                $.ligerDialog.error(data.message);
@ -161,8 +163,10 @@
            $.ligerDialog.success(message);
            if("1"==reloadType){
                resourceRest.$dictGrid.reload();
                resourceRest.$dictGrid.changePage("first");
            }else{
                resourceRest.$dictItemGrid.reload();
                resourceRest.$dictItemGrid.changePage("first");
            }
            this.$dialog.close();
        },
@ -192,7 +196,13 @@
                    resourceRest.editorResourceRestDialog(data.id);
                },
                onSelectRow:function(rowdata, rowid, rowobj) {
                    resourceRest.$dictItemGrid.loadServerData({resourceRestId:rowdata.id});
                    //resourceRest.$dictItemGrid.loadServerData({resourceRestId:rowdata.id});
                   // resourceRest.$dictItemGrid.changePage("first");
                    resourceRest.$dictItemGrid.set({
                        parms: {resourceRestId:rowdata.id}
                    });
                    resourceRest.$dictItemGrid.reload();
                    resourceRest.$dictItemGrid.changePage("first");
                }
            });
            this.$dictItemGrid= this.$dictItemGrid.ligerGrid({