Merge branch 'master' of http://192.168.1.220:10080/CoSharp/eip

hos-rest/src/main/java/com/yihu/hos/rest/models/standard/adapter/AdapterSchemeModel.java

@@ -26,6 +26,8 @@ public class AdapterSchemeModel extends Result implements Serializable {
    private String stdVersion;
    private String stdPublisherOrgCode;
    private Integer adapterStdId;
    private String adapterStdVersion;
@@ -119,4 +121,12 @@ public class AdapterSchemeModel extends Result implements Serializable {
    public void setAdapterPublisherOrgCode(String adapterPublisherOrgCode) {
        this.adapterPublisherOrgCode = adapterPublisherOrgCode;
    }
    public String getStdPublisherOrgCode() {
        return stdPublisherOrgCode;
    }
    public void setStdPublisherOrgCode(String stdPublisherOrgCode) {
        this.stdPublisherOrgCode = stdPublisherOrgCode;
    }
}

hos-rest/src/main/resources/spring/applicationContext.xml

@@ -24,7 +24,7 @@
    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource" destroy-method="close">
        <property name="driverClassName" value="com.mysql.jdbc.Driver"/>
        <property name="url" value="jdbc:mysql://172.19.103.57:8066/hos2?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="url" value="jdbc:mysql://172.19.103.42:8066/hos2?useUnicode=true&amp;characterEncoding=UTF-8"/>
        <property name="username" value="hos"/>
        <property name="password" value="123456"/>
        <property name="initialSize" value="1"/>

src/main/java/com/yihu/hos/standard/model/adapter/AdapterSchemeModel.java

@@ -41,6 +41,9 @@ public class AdapterSchemeModel extends Result implements Serializable {
    @Column(name="std_version")
    private String stdVersion;
    @Column(name="std_publisher_org_code")
    private String stdPublisherOrgCode;
    @Column(name="adapter_std_id")
    private Integer adapterStdId;
@@ -137,4 +140,12 @@ public class AdapterSchemeModel extends Result implements Serializable {
    public void setAdapterPublisherOrgCode(String adapterPublisherOrgCode) {
        this.adapterPublisherOrgCode = adapterPublisherOrgCode;
    }
    public String getStdPublisherOrgCode() {
        return stdPublisherOrgCode;
    }
    public void setStdPublisherOrgCode(String stdPublisherOrgCode) {
        this.stdPublisherOrgCode = stdPublisherOrgCode;
    }
}

src/main/resources/logback-spring.xml

@@ -13,7 +13,7 @@
	<appender name="hosAdmin" class="ch.qos.logback.core.rolling.RollingFileAppender">
		<file>${LOG_HOME}/hos-admin.log</file>
		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
			<fileNamePattern>${LOG_HOME}/rolling/hos-admin_%d{yyyy-MM-dd}.log</fileNamePattern>
			<fileNamePattern>${LOG_HOME}/hos-admin_%d{yyyy-MM-dd}.log</fileNamePattern>
		</rollingPolicy>
		<encoder>
			<pattern>%msg%n</pattern>

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetail.jsp

@@ -44,6 +44,12 @@
    </div>
  </div>
  <hr/>
  <div class="m-form-group" id="div_originPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>源机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_originPublisherOrgCode" data-type="select" name="stdPublisherOrgCode" data-attr-scan="stdPublisherOrgCode">
    </div>
  </div>
  <div class="m-form-group" id="div_stdId">
    <label><span class="red">*&nbsp;</span>源标准名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
@@ -58,7 +64,7 @@
  </div>
  <hr/>
  <div class="m-form-group" id="div_adapterPublisherOrgCode">
    <label><span class="red">*&nbsp;</span>发布机构名称：</label>
    <label><span class="red">*&nbsp;</span>目标机构名称：</label>
    <div class="l-text-wrapper m-form-control  div-">
      <input type="text" class="required f-w240 f-pl5" id="sel_publisherOrgCode" data-type="select" name="adapterPublisherOrgCode" data-attr-scan="adapterPublisherOrgCode">
    </div>

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/adapterDetailJs.jsp

@@ -32,6 +32,7 @@
          $("#sel_stdId").removeClass("required");
          $("#sel_stdVersion").removeClass("required");
          $("#sel_originPublisherOrgCode").removeClass("required");
          $("#sel_publisherOrgCode").removeClass("required");
          $("#sel_adapterStdId").removeClass("required");
          $("#sel_adapterStdVersion").removeClass("required");
@@ -60,6 +61,8 @@
                  type:data.type,
                  status:data.status
                });
                liger.get('sel_stdId').selectValue(data.stdId);
                liger.get('sel_stdVersion').selectValue(data.stdVersion);
                liger.get('sel_adapterStdId').selectValue(data.adapterStdId);
                liger.get('sel_adapterStdVersion').selectValue(data.adapterStdVersion);
              }else{
@@ -120,31 +123,69 @@
            parent.adapterplan.list.top.dialog_adapter_detail.close();
          });
          //平台标准名称
          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,
            urlParms:{
               condition: encodeURIComponent(JSON.stringify({
                 "type":0
               }))
             },
//          $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,
//            urlParms:{
//               condition: encodeURIComponent(JSON.stringify({
//                 "type":0
//               }))
//             },
//            cancelable:false,
//            onSuccess:function(data){
//              if(type !="modify" && $("#sel_stdId").val()=="" && data!=null&&data.length>0)
//              {
//                this.selectValue(data[0].code);
//              }
//              return false;
//            }});
          //源机构名称
          $("#sel_originPublisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getPublishers" ,
            cancelable:false,
            onSuccess:function(data){
              if(type !="modify" && $("#sel_stdId").val()=="" && data!=null&&data.length>0)
              if(type !="modify" && data!=null&&data.length>0)
              {
                this.selectValue(data[0].code);
              }
              return false;
            }});
          $("#sel_stdId").ligerComboBox({cancelable:false});
          $("#sel_stdVersion").ligerComboBox({cancelable:false});
          //源机构机构名称change事件
          $("#sel_originPublisherOrgCode").change(function(){
            var publisherOrgCode = $("#sel_originPublisherOrgCode").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(publisherOrgCode)){
              //源标准名称
              $("#sel_stdId").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getStandards" ,//?condition={\"type\":1,\"publisherOrgCode\":\""+publisherOrgCode+"\"}
                urlParms:{
                  condition: encodeURIComponent(JSON.stringify({
                    "type":1,
                    "publisherOrgCode":publisherOrgCode
                  }))
                },
                cancelable:false,
                onSuccess:function(data){
                  if(type !="modify" && $("#sel_stdId").val()=="" &&data!=null&&data.length>0)
                  {
                    this.selectValue(data[0].code);
                  }
                  return false;
                }});
            }
          });
          //平台标准名称change事件
          $("#sel_stdId").change(function(){
              var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
              if(!Util.isStrEmpty(standardId)){
                //平台标准版本
                $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions" ,//?standardId="+standardId+"&condition="+JSON.stringify({"publishStatus":1})
                  urlParms:{
                    standardId:standardId,
                    condition: encodeURIComponent(JSON.stringify({"publishStatus":1}))
                  },
            var standardId = $("#sel_stdId").ligerGetComboBoxManager().getValue();
            if(!Util.isStrEmpty(standardId)){
              //平台标准版本
              $("#sel_stdVersion").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getVersions" ,//?standardId="+standardId+"&condition="+JSON.stringify({"publishStatus":1})
                urlParms:{
                  standardId:standardId,
                  condition: encodeURIComponent(JSON.stringify({"publishStatus":1}))
                },
                cancelable:false,
                onSuccess:function(data){
                  if(type !="modify" && $("#sel_stdVersion").val()=="" && data!=null&&data.length>0)
@@ -156,7 +197,7 @@
            }
          });
          //发布机构名称
          //目标机构名称
          $("#sel_publisherOrgCode").ligerComboBox({url : adapterplan.attr._url+"/standardCenter/getPublishers" ,
            cancelable:false,
            onSuccess:function(data){
@@ -166,7 +207,6 @@
              }
              return false;
            }});
          $("#sel_stdVersion").ligerComboBox({cancelable:false});
          $("#sel_adapterStdId").ligerComboBox({cancelable:false});
          $("#sel_adapterStdVersion").ligerComboBox({cancelable:false});

src/main/webapp/WEB-INF/ehr/jsp/standard/adapterplan/indexJs.jsp

@@ -142,7 +142,7 @@
      var callback = function () {
        adapterplan.getTypeList();
      };
      adapterplan.list.showDialog(_tital, _url, 520, 500, callback);
      adapterplan.list.showDialog(_tital, _url, 580, 500, callback);
    },
    addVersion: function (id,name,rowindex,type) {
      var _tital;