浏览代码

Merge branch 'master' of http://192.168.1.220:10080/esb/esb

yingjie 9 年之前
父节点
当前提交
9cea3a2297
共有 20 个文件被更改,包括 172 次插入63 次删除
  1. 6 6
      Hos-Resource-WS/Hos-Resource-WS.iml
  2. 7 1
      Hos-Resource-WS/pom.xml
  3. 17 12
      Hos-Resource-WS/src/main/java/com.yihu.ehr/common/ApplicationStart.java
  4. 10 0
      Hos-Resource-WS/src/main/java/com.yihu.ehr/util/operator/TreeNode.java
  5. 28 7
      Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/SQLWebService.java
  6. 2 2
      Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/inf/ISQLWebService.java
  7. 9 9
      Hos-Resource-WS/src/main/resources/spring/spring-cxf.xml
  8. 14 5
      Hos-resource/src/main/java/com/yihu/ehr/crawler/model/config/SysConfig.java
  9. 10 5
      Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java
  10. 18 2
      Hos-resource/src/main/java/com/yihu/ehr/crawler/service/DataCollectDispatcher.java
  11. 1 1
      Hos-resource/src/main/java/com/yihu/ehr/job/service/ArchiveUploadJob.java
  12. 1 1
      Hos-resource/src/main/java/com/yihu/ehr/resource/controller/RsCategoryController.java
  13. 4 2
      Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java
  14. 0 2
      Hos-resource/src/main/resources/config/sys.config.xml
  15. 17 3
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp
  16. 2 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialog.jsp
  17. 1 2
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialogJs.jsp
  18. 0 1
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceImportDatasetDialogJs.jsp
  19. 1 0
      Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceInfoDialog.jsp
  20. 24 0
      Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

+ 6 - 6
Hos-Resource-WS/Hos-Resource-WS.iml

@ -114,6 +114,12 @@
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.3.0" level="project" />
    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.1.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
@ -122,11 +128,5 @@
    <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.7" level="project" />
    <orderEntry type="library" name="Maven: com.sun.istack:istack-commons-runtime:2.16" level="project" />
    <orderEntry type="library" name="Maven: com.sun.xml.fastinfoset:FastInfoset:1.2.12" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.0.0" level="project" />
    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.0.0" level="project" />
  </component>
</module>

+ 7 - 1
Hos-Resource-WS/pom.xml

@ -7,7 +7,7 @@
    <groupId>ehr</groupId>
    <artifactId>Hos-Resource-WS</artifactId>
    <version>1.0-SNAPSHOT</version>
    <packaging>war</packaging>
    <properties>
        <aspectj.version>1.8.7</aspectj.version>
        <jackson.version>2.4.6</jackson.version>
@ -313,6 +313,12 @@
            <artifactId>cxf-rt-transports-http</artifactId>
            <version>3.0.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.cxf</groupId>
            <artifactId>cxf-rt-bindings-soap</artifactId>
            <version>3.0.0</version>
        </dependency>
        <!--=============httpclient end=============-->
    </dependencies>

+ 17 - 12
Hos-Resource-WS/src/main/java/com.yihu.ehr/common/ApplicationStart.java

@ -11,6 +11,7 @@ import com.yihu.ehr.util.log.LogUtil;
import javax.servlet.ServletContextEvent;
import javax.servlet.ServletContextListener;
import javax.xml.stream.XMLInputFactory;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
@ -28,8 +29,8 @@ public class ApplicationStart implements ServletContextListener {
    @Override
    public void contextInitialized(ServletContextEvent context) {
        try {
            String home = System.getProperty("catalina.home").replace('\\','/');
            String homeUrl = home.substring(0,home.lastIndexOf('/')+1);
            String home = System.getProperty("catalina.home").replace('\\', '/');
            String homeUrl = home.substring(0, home.lastIndexOf('/') + 1);
            dbConfig(homeUrl);
            sslConfig(homeUrl);
@ -41,33 +42,35 @@ public class ApplicationStart implements ServletContextListener {
    /**
     * 修改微服务连接ssl文件
     *
     * @param homeUrl
     */
    private void sslConfig(String homeUrl) throws Exception {
        InputStream in = this.getClass().getResourceAsStream("/config/http.properties");
        prop.load(in);
        String configPath = this.getClass().getClassLoader().getResource("/").getPath()+ "config/http.properties";
        String configPath = this.getClass().getClassLoader().getResource("/").getPath() + "config/http.properties";
        OutputStream fos = new FileOutputStream(configPath);
        String url = homeUrl+"ssl/tomcat.keystore";
        prop.setProperty("sslKeystore",url);
        prop.store(fos,"last update");
        String url = homeUrl + "ssl/tomcat.keystore";
        prop.setProperty("sslKeystore", url);
        prop.store(fos, "last update");
        in.close();
        fos.close();
    }
    /**
     * 修改数据库连接字符串
     *
     * @param homeUrl
     */
    private void dbConfig(String homeUrl) throws Exception {
        InputStream in = this.getClass().getResourceAsStream("/config/dbhelper.properties");
        prop.load(in);
        String configPath = this.getClass().getClassLoader().getResource("/").getPath()+ "config/dbhelper.properties";
        String configPath = this.getClass().getClassLoader().getResource("/").getPath() + "config/dbhelper.properties";
        OutputStream fos = new FileOutputStream(configPath);
        String url = homeUrl+"db/localDB.db";
        prop.setProperty("defaultName","miniResourceDB");
        prop.setProperty("defaultUri","jdbc:sqlite://"+url);
        prop.store(fos,"last update");
        String url = homeUrl + "db/localDB.db";
        prop.setProperty("defaultName", "miniResourceDB");
        prop.setProperty("defaultUri", "jdbc:sqlite://" + url);
        prop.store(fos, "last update");
        in.close();
        fos.close();
    }
@ -75,7 +78,9 @@ public class ApplicationStart implements ServletContextListener {
    @Override
    public void contextDestroyed(ServletContextEvent context) {
    }
    public static void main(String[] args) {
        System.out.println(520 / 3);
    }
}

+ 10 - 0
Hos-Resource-WS/src/main/java/com.yihu.ehr/util/operator/TreeNode.java

@ -1,5 +1,13 @@
package com.yihu.ehr.util.operator;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.endpoint.Endpoint;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.xerces.xni.QName;
/**
 * 树类
 *
@ -50,4 +58,6 @@ public class TreeNode {
    public void setIschecked(Boolean ischecked) {
        this.ischecked = ischecked;
    }
}

+ 28 - 7
Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/SQLWebService.java

@ -4,21 +4,28 @@ import com.yihu.ehr.dbhelper.jdbc.DBHelper;
import com.yihu.ehr.model.DataSource;
import com.yihu.ehr.ws.inf.ISQLWebService;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.xml.XMLSerializer;
import org.apache.commons.dbcp2.BasicDataSource;
import org.apache.cxf.endpoint.Client;
import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.jws.WebService;
/**
 * Created by Administrator on 2016/5/19.
 */
@WebService(endpointInterface = "com.yihu.ehr.ws.inf.ISQLWebService", serviceName = "testWS")
//@WebService(endpointInterface = "com.yihu.ehr.ws.inf.ISQLWebService", targetNamespace = "com.yihu.ehr.ws.inf")
@Controller
@RequestMapping("sql")
public class SQLWebService implements ISQLWebService {
    public static JdbcTemplate jdbcTemplate = null;
    @Override
    @RequestMapping("excuteSQL")
    @ResponseBody
    public String excuteSQL(String sql) {
        try {
            if (jdbcTemplate == null) {
@ -72,11 +79,11 @@ public class SQLWebService implements ISQLWebService {
            System.out.println(jdbcTemplate.queryForList(sql));
            JSONArray jo = JSONArray.fromObject(jdbcTemplate.queryForList(sql));
            XMLSerializer xmlSerializer = new XMLSerializer();
            xmlSerializer.setRootName("req");
            xmlSerializer.setRootName("Return");
            xmlSerializer.setElementName("data");
           xmlSerializer.setTypeHintsEnabled(false);//设置data class="object"  没有class
           // xmlSerializer.setForceTopLevelObject(false);
           // xmlSerializer.setRemoveNamespacePrefixFromElements(false);
            xmlSerializer.setTypeHintsEnabled(false);//设置data class="object"  没有class
            // xmlSerializer.setForceTopLevelObject(false);
            // xmlSerializer.setRemoveNamespacePrefixFromElements(false);
            String xml = xmlSerializer.write(jo);
            return xml;
        } catch (Exception e1) {
@ -85,4 +92,18 @@ public class SQLWebService implements ISQLWebService {
        }
    }
    public static void main(String[] args) throws Exception {
        JaxWsDynamicClientFactory factory = JaxWsDynamicClientFactory.newInstance();
        Client client = factory.createClient("http://172.19.103.37:8081/service/sql?wsdl");
        try {
            Object[] result = client.invoke("excuteSQL", "select * from HDSC01_03"); // 按照方法的参数来提供值
            if (result != null && result.length > 0) {
                System.out.println(result[0]); // 通过getUsername来获取对象的username属性
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

+ 2 - 2
Hos-Resource-WS/src/main/java/com.yihu.ehr/ws/inf/ISQLWebService.java

@ -7,8 +7,8 @@ import javax.jws.WebService;
/**
 * Created by Administrator on 2016/5/19.
 */
@WebService
@WebService(targetNamespace = "com.yihu.ehr.ws.inf")
public interface ISQLWebService {
    @WebMethod
    @WebMethod(operationName = "excuteSQL")
    public String excuteSQL(@WebParam(name = "sql") String sql);
}

+ 9 - 9
Hos-Resource-WS/src/main/resources/spring/spring-cxf.xml

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
	xsi:schemaLocation="
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
       xsi:schemaLocation="
 http://www.springframework.org/schema/beans 
 http://www.springframework.org/schema/beans/spring-beans.xsd 
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
 ">
    <import resource="classpath:META-INF/cxf/cxf.xml"/>
    <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
    <jaxws:endpoint id="/sqlService" implementor="com.yihu.ehr.ws.SQLWebService" address="/sql"/>
	<import resource="classpath:META-INF/cxf/cxf.xml"/>
	<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
	<jaxws:endpoint id="/testWebService"
		implementor="com.yihu.ehr.ws.SQLWebService"
		address="/testWS" />
		
</beans> 

+ 14 - 5
Hos-resource/src/main/java/com/yihu/ehr/crawler/model/config/SysConfig.java

@ -19,13 +19,14 @@ public class SysConfig {
    private static Logger logger = LogManager.getLogger(SysConfig.class);
    public static final String HOS_RESOURCES_CONFIG = "/config/sys.config.xml";
    public static Map<String, String> publicKeyMap;
    public static String tempFile;
    public static String registerDataSet;
    public static String registerIdCardNo;
    private static volatile SysConfig instance = null;
    private HashMap<String, PatientIdentity> patientIdentityHashMap;
    private Map<String, PatientIndex> patientIndexMap;//病人摘要信息内容
    private Map<String, String> publicKeyMap;
    private Map<String, String> versionMap;
    public static String tempFile;
    public static String registerDataSet;
    public static String registerIdCardNo;
    private SysConfig() {
        patientIdentityHashMap = new HashMap<>();
@ -83,10 +84,18 @@ public class SysConfig {
        return patientIndexMap;
    }
    public static Map<String, String> getPublicKeyMap() {
    public Map<String, String> getPublicKeyMap() {
        return publicKeyMap;
    }
    public Map<String, String> getVersionMap() {
        return versionMap;
    }
    public void setVersionMap(Map<String, String> versionMap) {
        this.versionMap = versionMap;
    }
    private Document getDocument() throws DocumentException {
        SAXReader reader = new SAXReader();
        Document document = null;

+ 10 - 5
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/CrawlerManager.java

@ -89,7 +89,7 @@ public class CrawlerManager {
            return message;
        }
        patient.setReUploadFlg(StringUtil.toString(false));
        logger.trace("采集->注册->打包上传,任务ID:,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
        logger.trace("采集->注册->打包上传,patient_id:" + patient.getPatientId() + ", event_no:" + patient.getEventNo());
        try {
            //getToken
            if (!dispatch.getToken()) {
@ -97,6 +97,14 @@ public class CrawlerManager {
                logger.error(message);
                return message;
            }
            //getRemoteVersion
            if (!dispatch.getRemoteVersion(patient.getOrgCode())) {
                message = "远程版本获取失败";
                logger.error(message);
                return message;
            }
            Map<String, AdapterDataSet> dataSetMap = new HashMap<>();
            Map<String, JsonNode> dataMap = new HashMap<>();
            for (String key : adapterDataSetMap.keySet()) {
@ -104,9 +112,6 @@ public class CrawlerManager {
                 * 获取数据
                 */
                AdapterDataSet adapterDataSet = adapterDataSetMap.get(key);
                if (patient.getEventNo().equals("1001000001")) {
                    System.out.println("123");
                }
                String data = dispatch.fecthData(patient, adapterDataSet);
                if (StringUtil.isEmpty(data)) {
                    continue;
@ -175,7 +180,7 @@ public class CrawlerManager {
                        adapterDataSetMap.put(adapterDatasetModel.getStdDatasetCode(), new AdapterDataSet(adapterDatasetModel, adapterVersion));
                    }
                }
                SysConfig.getInstance().setVersionMap(new HashMap<>());
                adapterFlg = true;
            } catch (Exception e) {
                adapterFlg = false;

+ 18 - 2
Hos-resource/src/main/java/com/yihu/ehr/crawler/service/DataCollectDispatcher.java

@ -55,6 +55,22 @@ public class DataCollectDispatcher {
        }
    }
    public Boolean getRemoteVersion (String orgCode) {
        try {
            if (StringUtil.isEmpty(SysConfig.getInstance().getVersionMap().get(orgCode))) {
                String stdVersion = EsbHttp.getRemoteVersion(orgCode);
                if (StringUtil.isEmpty(stdVersion)) {
                    return false;
                }
                SysConfig.getInstance().getVersionMap().put(orgCode, stdVersion);
            }
            return true;
        } catch (Exception e) {
            logger.error("本次任务执行失败,获取token失败!");
            return false;
        }
    }
    /**
     * 获取病人列表
     *
@ -150,7 +166,7 @@ public class DataCollectDispatcher {
        return propertyMap;
    }
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet, List<EhrCondition> queryParams ) {
    public String fecthData(Patient patient, AdapterDataSet adapterDataSet, List<EhrCondition> queryParams) {
        try {
            ObjectMapper mapper = new ObjectMapper();
            ObjectNode paramsNode = mapper.createObjectNode();
@ -175,7 +191,7 @@ public class DataCollectDispatcher {
                jsonObject.put("event_no", patient.getEventNo());
                String agencyCode = patient.getOrgCode();
                jsonObject.put("org_code", agencyCode);
                jsonObject.put("inner_version", "123456");
                jsonObject.put("inner_version", SysConfig.getInstance().getVersionMap().get(patient.getOrgCode()));
                jsonObject.put("create_date", DateUtil.toString(new Date(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT));
                jsonObject.put("event_time", patient.getReferenceTime());//DateUtil.toString(patient.getReferenceTime(), DateUtil.DEFAULT_YMDHMSDATE_FORMAT)
                if (StringUtil.isEmpty(patient.getReUploadFlg())) {

+ 1 - 1
Hos-resource/src/main/java/com/yihu/ehr/job/service/ArchiveUploadJob.java

@ -25,7 +25,7 @@ public class ArchiveUploadJob implements IBaseJob {
    @Override
    public void execute(String jobId) throws Exception{
        System.out.println("档案上传quartz:"+DateConvert.toString(new Date()) + ":"+jobId);
        System.out.println("档案上传quartz:"+DateConvert.toString(new Date()) + ",jobId:"+jobId);
        logger.info("档案上传quartz:"+DateConvert.toString(new Date()) + ":"+jobId);
        IDatacollectManager datacollect = SpringBeanUtil.getService(Services.Datacollect);
        RsJobConfig job = datacollect.getJobById(jobId);

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

@ -64,7 +64,7 @@ public class RsCategoryController extends BaseController {
                        s1.append(s.charAt(i));
                }
            }
            rrrd.setRemark(s1.toString());
           // rrrd.setRemark(s1.toString());
            model.addAttribute("model", rrrd);
            model.addAttribute("contentPage", "resource/category/rsCategoryInfoDialog");
        } catch (Exception e) {

+ 4 - 2
Hos-resource/src/main/java/com/yihu/ehr/resource/service/impl/RsCategoryServiceImpl.java

@ -37,6 +37,7 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
    @Transactional
    public Result createCategory(RsResourceCategory rrc) throws Exception {
        RsResourceCategory rrcTemp = rsCategoryDao.getCategoryByNameAndPid(rrc.getName(), rrc.getPid());
       // rrc.setRemark(rrc.getRemark().replace("\n","</br>"));
        if (rrcTemp == null)
            rsCategoryDao.saveEntity(rrc);
        else
@ -47,6 +48,7 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
    @Transactional
    public Result updateCategory(RsResourceCategory rrc) throws Exception {
        RsResourceCategory rrcTemp = rsCategoryDao.getCategoryByNameAndPidWithOutThis(rrc.getName(), rrc.getPid(), rrc.getId());
    //    rrc.setRemark(rrc.getRemark().replace("\n","</br>"));
        if (rrcTemp != null)
            return Result.error("分类名称重复");
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, rrc.getId());
@ -66,13 +68,13 @@ public class RsCategoryServiceImpl implements IRsCategoryService {
        List<RsResourceCategory> categoryList = rsCategoryDao.getCategoryByPid(id);
        if(categoryList==null || categoryList.size()>0)
        {
            return Result.error("存在子节点,不允许删除!");
            return Result.error("该分类包含子分类,不可直接删除!");
        }
        //判断是否存在资源
        List<RsResource> resourceList =  rsResourceDao.getAllRsResourceByCategory(id);
        if(resourceList==null || resourceList.size()>0)
        {
            return Result.error("存在所属资源,不允许删除!");
            return Result.error("该分类包含注册资源,不可直接删除!");
        }
        RsResourceCategory rc = rsCategoryDao.getEntity(RsResourceCategory.class, id);

+ 0 - 2
Hos-resource/src/main/resources/config/sys.config.xml

@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<config>
    <temp_file>D:\temp</temp_file>
    <!--存储模式:轻量模式:0,传统模式:1-->
    <storage_pattern>0</storage_pattern>
    <event_no>
        <item>HDSD03_01_031</item>
        <item>HDSD00_01_579</item>

+ 17 - 3
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/datacollect/editorJobJs.jsp

@ -21,8 +21,9 @@
            $("#div_form").show().steps({
                //transitionEffect: "fade",
                onStepChanging:function(d,from,to){
                    if(from>to){
                        return true
                        return true;
                    }
                    else{
                        return me.verify(to);
@ -64,7 +65,10 @@
                            me.$listDataset.reload();
                            me.needReload=false;
                        }
                        else{
                        if(me.needRender)
                        {
                            alert(1);
                            me.$listDataset.setData($("#txtJobDataset").val());
                            me.$listDataset.reRender();
                        }
                    }
@ -101,7 +105,13 @@
            $("a[href='#cancel']").addClass("l-button-no");
            //业务类型
            $('#jobContentClass').ligerComboBox({dict:true,dictName:'JOB_CONTENT_CLASS'});
            $('#jobContentClass').ligerComboBox({
                dict:true,
                dictName:'JOB_CONTENT_CLASS',
                onChange:function(){
                    me.needRender = true;
                }
            });
            $('input[name="jobContentType"]').ligerRadio();
            $(document).on('click','input[name="jobContentType"]',function(){
@ -205,6 +215,10 @@
                        data.checked ="0";
                    editorJob.setCheckVal();
                },
                //全选事件
                onCheckAllRow:function(){
                    me.setCheckVal();
                },
                //加载完成后赋值$("#txtJobDataset")
                onAfterShowData:function(grid)
                {

+ 2 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialog.jsp

@ -29,8 +29,8 @@
            <div class="m-form-control">
                        <textarea rows="10" name="remark" data-type="text"  class="l-textarea"
                                  style="width:350px;height: 200px"
                        ></textarea>
                                  style="width:350px;height: 170px"
                        >${model.remark}</textarea>
            </div>
        </div>
    <div class="m-form-bottom">

+ 1 - 2
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/category/rsCategoryInfoDialogJs.jsp

@ -29,8 +29,7 @@
            var data = {
                name: '${model.name}',
                pid: '${model.pid}',
                status: '${model.status}',
                remark: '${model.remark}'
                status: '${model.status}'
            };
            if(data.pid!=""){

+ 0 - 1
Hos-resource/src/main/webapp/WEB-INF/ehr/jsp/resource/resourceregister/rsResourceImportDatasetDialogJs.jsp

@ -179,7 +179,6 @@
                ],
                validate: true,
                rownumbers: false,
                checkbox: true,
                parms: {datasetId: rsResourceImportDatasetDialog.datasetId},
                allowAdjustColWidth: false,
                width: 240,

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

@ -6,6 +6,7 @@
    <div class="m-form-group">
        <label><span class="red">*&nbsp;</span>资源名称:</label>
        <div class="l-text-wrapper m-form-control">
            <input type="hidden" name="id"/>
            <input type="text" id="inp_resource_name" class="required f-w240" placeholder="请输入资源类别名称"  required-title="该项为必输项!" name="name"/>
        </div>
    </div>

+ 24 - 0
Hos-resource/src/main/webapp/develop/lib/ligerui/custom/ligerOverwrite.js

@ -100,6 +100,7 @@
    };
    /******************************************************/
    //重写条件选择控件 add by hzp at 20160119
    $.extend($.ligerui.controls.Filter.prototype, {
        getValue: function () {
@ -1830,6 +1831,29 @@
                value = parseFloat(value).toFixed(p.decimalplace);
            }
            this.inputText.val(value)
        },
        _init: function ()
        {
            $.ligerui.controls.Spinner.base._init.call(this);
            var p = this.options;
            if (p.type == 'float')
            {
                p.step = 0.1;
                p.interval = 300;
            } else if (p.type == 'int')
            {
                p.step = 1;
                p.interval = 300;
            } else if (p.type == 'time')
            {
                p.step = 1;
                p.interval = 300;
            } else
            {
                p.type = "int";
                p.step = 1;
                p.interval = 300;
            }
        }
    });